]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
[StTooltip] Fix _get_preferred_width
authorColin Walters <walters@verbum.org>
Wed, 11 Nov 2009 21:22:22 +0000 (16:22 -0500)
committerColin Walters <walters@verbum.org>
Thu, 12 Nov 2009 16:42:00 +0000 (11:42 -0500)
It was ignoring the label width.

https://bugzilla.gnome.org/show_bug.cgi?id=600734

src/st/st-tooltip.c

index 5232dbc41ae84bc92630c100d587541471e4a015..1fbec22e320f8b740d88e750fb9f3a1388662042 100644 (file)
@@ -148,7 +148,6 @@ st_tooltip_get_preferred_width (ClutterActor *self,
 {
   StTooltipPrivate *priv = ST_TOOLTIP (self)->priv;
   StThemeNode *theme_node = st_widget_get_theme_node (ST_WIDGET (self));
-  gfloat min_label_w, natural_label_w;
   gfloat label_height, arrow_height;
   ClutterActor *arrow_image;
 
@@ -180,13 +179,8 @@ st_tooltip_get_preferred_width (ClutterActor *self,
     {
       clutter_actor_get_preferred_width (priv->label,
                                          label_height,
-                                         &min_label_w,
-                                         &natural_label_w);
-    }
-  else
-    {
-      min_label_w = 0;
-      natural_label_w = 0;
+                                         min_width_p,
+                                         natural_width_p);
     }
 
   st_theme_node_adjust_preferred_width (theme_node, min_width_p, natural_width_p);